Added checks that distinguish between cygwin and windows in some

places.

diff --git a/lisp/eshell/em-cmpl.el b/lisp/eshell/em-cmpl.el
index ac93223bd572ab546829bcbcfec6dd82f2f35269..09c6e784f9e0c30daa3b4cee5b0e90f9c482f13b 100644 (file)
--- a/lisp/eshell/em-cmpl.el
+++ b/lisp/eshell/em-cmpl.el
@@ -142,7 +142,8 @@ to writing a completion function."
   :type (get 'pcomplete-dir-ignore 'custom-type)
   :group 'eshell-cmpl)
 
-(defcustom eshell-cmpl-ignore-case (eshell-under-windows-p)
+(defcustom eshell-cmpl-ignore-case (or (eshell-under-windows-p)
+                                      (eshell-under-cygwin-p))
   (documentation-property 'pcomplete-ignore-case
                          'variable-documentation)
   :type (get 'pcomplete-ignore-case 'custom-type)

diff --git a/lisp/eshell/em-dirs.el b/lisp/eshell/em-dirs.el
index 2838ec5e8bf2b3e65d638bc52353324812eb9d7e..1d078196ec07940614423bd1595f603c183c694d 100644 (file)
--- a/lisp/eshell/em-dirs.el
+++ b/lisp/eshell/em-dirs.el
@@ -353,7 +353,8 @@ in the minibuffer:
   (setq args (eshell-flatten-list args))
   (let ((path (car args))
        (subpath (car (cdr args)))
-       (case-fold-search (eshell-under-windows-p))
+       (case-fold-search (or (eshell-under-windows-p)
+                             (eshell-under-cygwin-p)))
        handled)
     (if (numberp path)
        (setq path (number-to-string path)))

diff --git a/lisp/eshell/em-glob.el b/lisp/eshell/em-glob.el
index 9d5f8bc3adc6db97bcd2cda959b0cb6ec3b7b33f..09c65dfd7d66e794d25c4950ad38b406bd4e2b7c 100644 (file)
--- a/lisp/eshell/em-glob.el
+++ b/lisp/eshell/em-glob.el
@@ -76,7 +76,8 @@ by zsh for filename generation."
   :type 'boolean
   :group 'eshell-glob)
 
-(defcustom eshell-glob-case-insensitive (eshell-under-windows-p)
+(defcustom eshell-glob-case-insensitive (or (eshell-under-windows-p)
+                                           (eshell-under-cygwin-p))
   "*If non-nil, glob pattern matching will ignore case."
   :type 'boolean
   :group 'eshell-glob)

diff --git a/lisp/eshell/em-hist.el b/lisp/eshell/em-hist.el
index 468e938e32631f4d963d63aced85da7cb0a7204d..4da335cc1000ef49694f3a8d23929fde5926d4e7 100644 (file)
--- a/lisp/eshell/em-hist.el
+++ b/lisp/eshell/em-hist.el
@@ -805,7 +805,8 @@ Moves relative to START, or `eshell-history-index'."
         (motion (if (> arg 0) 1 -1))
         (n (mod (- (or start (eshell-search-start arg)) motion) len))
         (tried-each-ring-item nil)
-        (case-fold-search (eshell-under-windows-p))
+        (case-fold-search (or (eshell-under-windows-p)
+                              (eshell-under-cygwin-p)))
         (prev nil))
     ;; Do the whole search as many times as the argument says.
     (while (and (/= arg 0) (not tried-each-ring-item))

diff --git a/lisp/eshell/esh-util.el b/lisp/eshell/esh-util.el
index ef4bcda31a0ee64bd2eb221bc2f534d20c82780b..dae9655aff71051a829b70ca017e78be6b1317d3 100644 (file)
--- a/lisp/eshell/esh-util.el
+++ b/lisp/eshell/esh-util.el
@@ -146,6 +146,10 @@ function `string-to-number'."
   "Return non-nil if we are running under MS-DOS/Windows."
   (memq system-type '(ms-dos windows-nt)))
 
+(defsubst eshell-under-cygwin-p ()
+  "Return non-nil if we are running under Cygwin."
+  (eq system-type 'cygwin32))
+
 (defmacro eshell-condition-case (tag form &rest handlers)
   "Like `condition-case', but only if `eshell-pass-through-errors' is nil."
   (if eshell-handle-errors